Ensure Content-Length set on requests with known length bodies
#981
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mrbbot
force-pushed
the
bcoll/w2w-known-content-length
branch
3 times, most recently
from
c68ab49
to
0cc7836
Compare
jasnell
approved these changes
Aug 7, 2023
kentonv
reviewed
Aug 7, 2023
| if (method != kj::HttpMethod::HEAD && method != kj::HttpMethod::GET && | ||
| headers.get(kj::HttpHeaderId::CONTENT_LENGTH) == nullptr && | ||
| headers.get(kj::HttpHeaderId::TRANSFER_ENCODING) == nullptr) { | ||
| KJ_IF_MAYBE(l, requestBody.tryGetLength()) { |
There was a problem hiding this comment.
If the length isn't known, should we set Transfer-Encoding: chunked to emulate what an actual HTTP connection would do?
src/workerd/api/global-scope.c++
Outdated
| // If the request doesn't specify "Content-Length" or "Transfer-Encoding", set "Content-Length" | ||
| // to the body length if it's known. This ensures handlers for worker-to-worker requests can | ||
| // access known body lengths if they're set, without buffering bodies. | ||
| if (method != kj::HttpMethod::HEAD && method != kj::HttpMethod::GET && |
There was a problem hiding this comment.
GET can have a body. Instead of checking the method, maybe what you want is body != nullptr?
There was a problem hiding this comment.
GET can have a body?! Fun! Updated 👍
There was a problem hiding this comment.
Yeah... it's quite disturbing, but some people use it and we had to add support for it in the early days of Workers.
mrbbot
force-pushed
the
bcoll/w2w-known-content-length
branch
from
0cc7836
to
4ace1e4
Compare
This ensures requests with known length bodies from service bindings, or other internal requests from bindings (e.g. `R2Bucket#put()`), share that known length with the handler.
mrbbot
force-pushed
the
bcoll/w2w-known-content-length
branch
from
4ace1e4
to
6d25855
Compare
kentonv
approved these changes
Aug 9, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hey! 👋 This PR ensures requests with known length bodies from service bindings, or other internal requests from bindings (e.g.
R2Bucket#put()), share that known length with the handler.I'm not sure whether this change needs a compatibility flag. I'm leaning towards no, as we're only adding a header if
Content-LengthandTransfer-Encodingare missing. Although as highlighted by the new test, if aFixedLengthStream'sreadablewas used as a body, previouslyContent-Lengthwouldn't have been set. This is a user facing change, but I don't think it's breaking.